Merge GCC 13 changes from 9.1.0+really9.1.0+dfsg2-7.

diff --git a/debian/changelog b/debian/changelog
index c7b595fbc4363f7580a2c754afc51f5e5c5f84f1..bebe208a770a5dad4e775b9c8772670a3a1a0c31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vtk9 (9.2.6+dfsg1-1+exp3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Merge GCC 13 changes from 9.1.0+really9.1.0+dfsg2-7.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 22 Aug 2023 08:13:38 +0200
+
 vtk9 (9.2.6+dfsg1-1+exp2) experimental; urgency=medium
 
   * Team upload.
@@ -12,6 +19,14 @@ vtk9 (9.2.6+dfsg1-1+exp1) experimental; urgency=medium
 
  -- Anton Gladky <gladk@debian.org>  Sat, 25 Mar 2023 15:34:05 +0100
 
+vtk9 (9.1.0+really9.1.0+dfsg2-7) unstable; urgency=medium
+
+  * Team upload.
+  * Cherry-pick patch from upstream to fix FTBFS with gcc-13.
+    (Closes: #1037887)
+
+ -- Michael R. Crusoe <crusoe@debian.org>  Tue, 22 Aug 2023 00:27:20 +0200
+
 vtk9 (9.1.0+really9.1.0+dfsg2-6) unstable; urgency=medium
 
   * Team upload.

diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch
new file mode 100644 (file)
index 0000000..a61b4ac
--- /dev/null
+++ b/debian/patches/gcc-13.patch
@@ -0,0 +1,30 @@
+From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001
+From: Laurent Rineau <laurent.rineau@cgal.org>
+Date: Tue, 17 Jan 2023 16:18:53 +0100
+Subject: Add #include <cstdint> to compile with gcc13
+Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b
+
+The `vtkSEPReader` was introduced by MRs !4909 (from my former
+collaborator Maxime) and !4938. Then it was highly modified by
+!7516. The later MR is the one that introduced the uses of
+`std::uint8_t` and `std::uint32_t`.
+
+Those types needs the inclusion of `<cstdint>`.
+---
+ IO/Image/vtkSEPReader.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/IO/Image/vtkSEPReader.h
++++ b/IO/Image/vtkSEPReader.h
+@@ -25,8 +25,9 @@
+ #include "vtkImageAlgorithm.h"
+ #include "vtkNew.h" // for ivars
+ 
+-#include <array>  // for std::array
+-#include <string> // for std::string
++#include <array>   // for std::array
++#include <cstdint> // for std::uint8_t and std::uint32_t
++#include <string>  // for std::string
+ 
+ namespace details
+ {

diff --git a/debian/patches/series b/debian/patches/series
index 133ce5087fe20fd9e7738f0d334a64b2b99e29f1..bbde548ff14f745077c75c8af43ec6ac2a6be5fc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 98_fix_mpi4py.py
 99_fix_ftbfs.patch
 #110_vtk9_netcdf.patch
+gcc-13.patch